home *** CD-ROM | disk | FTP | other *** search
/ Skunkware 98 / Skunkware 98.iso / src / net / bind-contrib.tar.gz / bind-contrib.tar / contrib / os2-emx / diffs.txt next >
Text File  |  1996-10-25  |  25KB  |  778 lines
  1. diff -r -w -c 494p1/compat/lib/setitimer.c os2-494p1/compat/lib/setitimer.c
  2. *** 494p1/compat/lib/setitimer.c    Wed Dec 14 22:23:52 1994
  3. --- os2-494p1/compat/lib/setitimer.c    Tue Sep 03 22:37:20 1996
  4. ***************
  5. *** 2,7 ****
  6. --- 2,20 ----
  7.   static char rcsid[] = "$Id: diffs.txt,v 1.1 1996/10/25 17:13:54 vixie Exp $";
  8.   #endif
  9.   
  10. + #ifdef __EMX__
  11. + #include <sys/time.h>
  12. + 
  13. + int setitimer(int which, const struct itimerval *value,
  14. +             struct itimerval *ovalue)
  15. + {
  16. +         if (alarm(value->it_value.tv_sec) >= 0)
  17. +                 return (0);
  18. +         else
  19. +                 return (-1);
  20. + }
  21. + #endif
  22. + 
  23.   /*
  24.    * Setitimer emulation routine for UNICOS BIND.
  25.    */
  26. diff -r -w -c 494p1/conf/options.h os2-494p1/conf/options.h
  27. *** 494p1/conf/options.h    Fri May 17 02:10:41 1996
  28. --- os2-494p1/conf/options.h    Tue Sep 03 22:24:22 1996
  29. ***************
  30. *** 88,94 ****
  31.   #define QRYLOG      /* enable SIGWINCH for query logging (bb) */
  32.   /*#define YPKLUDGE      /* deal effectively with broken "ypserv -i" (mcsun) */
  33.   #define TRACEROOT      /* trace bogus root servers and ignore them (pma,bb) */
  34. ! /*#define LOCALDOM    /* permit "domain" directive in named.boot (ucb) */
  35.   #define FORCED_RELOAD    /* refresh secondary zones on SIGHUP (pma) */
  36.   #define SLAVE_FORWARD    /* use sensible timeouts on slave forwarders (pma) */
  37.   #define WANT_PIDFILE    /* if you want the named.pid file (ucb/arc) */
  38. --- 88,94 ----
  39.   #define QRYLOG          /* enable SIGWINCH for query logging (bb) */
  40.   /*#define YPKLUDGE      /* deal effectively with broken "ypserv -i" (mcsun) */
  41.   #define TRACEROOT       /* trace bogus root servers and ignore them (pma,bb) */
  42. ! #define LOCALDOM      /* permit "domain" directive in named.boot (ucb)
  43.   #define FORCED_RELOAD   /* refresh secondary zones on SIGHUP (pma) */
  44.   #define SLAVE_FORWARD   /* use sensible timeouts on slave forwarders (pma) */
  45.   #define WANT_PIDFILE    /* if you want the named.pid file (ucb/arc) */
  46. ***************
  47. *** 116,122 ****
  48.   #define PURGE_ZONE    /* remove all traces of a zone when reloading (mpa) */
  49.   #define STATS        /* keep nameserver statistics; uses more memory */
  50.   #define RENICE      /* named-xfer should run at normal priority */
  51. ! /*#define XSTATS    /* extended statistics, syslogged periodically (bg) */
  52.   /*#define BIND_NOTIFY    /* experimental - do not enable in customer products */
  53.   #define LOC_RR        /* support for LOC record parsing (ckd/vix) */
  54.   #define SORT_RESPONSE    /* should we try to sort responses optimally? (vix) */
  55. --- 116,122 ----
  56.   #define PURGE_ZONE      /* remove all traces of a zone when reloading (mpa) */
  57.   #define STATS           /* keep nameserver statistics; uses more memory */
  58.   #define RENICE          /* named-xfer should run at normal priority */
  59. ! #define XSTATS        /* extended statistics, syslogged periodically (bg)
  60.   /*#define BIND_NOTIFY   /* experimental - do not enable in customer products */
  61.   #define LOC_RR          /* support for LOC record parsing (ckd/vix) */
  62.   #define SORT_RESPONSE   /* should we try to sort responses optimally? (vix) */
  63. diff -r -w -c 494p1/conf/portability.h os2-494p1/conf/portability.h
  64. *** 494p1/conf/portability.h    Thu Jun 06 13:19:09 1996
  65. --- os2-494p1/conf/portability.h    Tue Sep 03 22:31:14 1996
  66. ***************
  67. *** 153,158 ****
  68. --- 153,166 ----
  69.   # define SYSV
  70.   #endif
  71.   
  72. + #ifdef __EMX__
  73. + # define vfork fork
  74. + # define USE_POSIX
  75. + # define USE_UTIME
  76. + # define HAVE_SETVBUF
  77. + # define NEED_STRCASECMP
  78. + #endif
  79. + 
  80.   #if defined(_POSIX_SOURCE) || defined(__sgi) || defined(__ultrix) || \
  81.           defined(__hpux) || (defined(BSD) && (BSD >= 199103)) || \
  82.           (defined(sun) && defined(SYSV))
  83. ***************
  84. *** 424,430 ****
  85.   # define PORT_WOULDBLK    EWOULDBLOCK
  86.   #endif
  87.   
  88. ! #if defined(USE_POSIX)
  89.   # define USE_SETSID
  90.   #endif
  91.   
  92. --- 432,438 ----
  93.   # define PORT_WOULDBLK  EWOULDBLOCK
  94.   #endif
  95.   
  96. ! #if defined(USE_POSIX) && !defined(__EMX__)
  97.   # define USE_SETSID
  98.   #endif
  99.   
  100. diff -r -w -c 494p1/include/netdb.h os2-494p1/include/netdb.h
  101. *** 494p1/include/netdb.h    Wed May 08 22:59:10 1996
  102. --- os2-494p1/include/netdb.h    Tue Sep 03 22:15:52 1996
  103. ***************
  104. *** 67,77 ****
  105. --- 67,85 ----
  106.   #endif
  107.   #include <sys/cdefs.h>
  108.   
  109. + #ifdef __EMX__
  110. + #define _PATH_HEQUIV    "/tcpip/etc/hosts.equ"
  111. + #define _PATH_HOSTS     "/tcpip/etc/hosts"
  112. + #define _PATH_NETWORKS  "/tcpip/etc/networks"
  113. + #define _PATH_PROTOCOLS "/tcpip/etc/protocol"
  114. + #define _PATH_SERVICES  "/tcpip/etc/services"
  115. + #else
  116.   #define _PATH_HEQUIV    "/etc/hosts.equiv"
  117.   #define _PATH_HOSTS     "/etc/hosts"
  118.   #define _PATH_NETWORKS  "/etc/networks"
  119.   #define _PATH_PROTOCOLS "/etc/protocols"
  120.   #define _PATH_SERVICES  "/etc/services"
  121. + #endif
  122.   
  123.   extern int h_errno;
  124.   
  125. diff -r -w -c 494p1/include/resolv.h os2-494p1/include/resolv.h
  126. *** 494p1/include/resolv.h    Sun Jun 02 01:20:38 1996
  127. --- os2-494p1/include/resolv.h    Tue Sep 03 22:16:26 1996
  128. ***************
  129. *** 87,93 ****
  130. --- 87,97 ----
  131.    */
  132.   
  133.   #ifndef _PATH_RESCONF
  134. + #ifdef __EMX__
  135. + #define _PATH_RESCONF        "/tcpip/etc/resolv"
  136. + #else
  137.   #define _PATH_RESCONF        "/etc/resolv.conf"
  138. + #endif
  139.   #endif
  140.   
  141.   /*
  142. diff -r -w -c 494p1/named/db_dump.c os2-494p1/named/db_dump.c
  143. *** 494p1/named/db_dump.c    Mon Aug 05 01:31:30 1996
  144. --- os2-494p1/named/db_dump.c    Tue Sep 03 21:42:00 1996
  145. ***************
  146. *** 139,145 ****
  147. --- 139,150 ----
  148.           return;
  149.       }
  150.   
  151. + 
  152. + #ifdef __EMX__
  153. +     if (rename_unixstyle(tmpcheckfile, cache_file)) {
  154. + #else
  155.       if (rename(tmpcheckfile, cache_file)) {
  156. + #endif
  157.           dprintf(3, (ddt, "doachkpt(install %s to %s failed, %d)\n",
  158.                       tmpcheckfile, cache_file, errno));
  159.       }
  160. ***************
  161. *** 235,242 ****
  162. --- 240,259 ----
  163.   {
  164.           FILE    *fp;
  165.   
  166. + #ifdef __EMX__
  167. +         char *cp;
  168. + #endif
  169. + 
  170.           dprintf(3, (ddt, "doadump()\n"));
  171.           syslog(LOG_NOTICE, "dumping nameserver data\n");
  172. + 
  173. + #ifdef __EMX__
  174. +         if (((cp = getenv("TMP")) != NULL) || ((cp = getenv("TEMP")) != NULL)) {
  175. +         /* TMP or TEMP points to the OS/2 temporaries directory */
  176. +           strcpy(dumpfile, cp);
  177. +           strcat(dumpfile, _PATH_DUMPFILEF);
  178. +         }
  179. + #endif
  180.   
  181.           if ((fp = fopen(dumpfile, "w")) == NULL)
  182.                   return;
  183. diff -r -w -c 494p1/named/db_glob.h os2-494p1/named/db_glob.h
  184. *** 494p1/named/db_glob.h    Wed Dec 06 12:34:39 1995
  185. --- os2-494p1/named/db_glob.h    Thu Aug 08 11:12:16 1996
  186. ***************
  187. *** 71,80 ****
  188. --- 71,92 ----
  189.           /* current line number */
  190.   DECL    int             lineno;
  191.   
  192. + #ifdef __EMX__
  193. + 
  194.   #ifdef DUMPFILE
  195. + DECL    char            path_dumpfile[_MAX_PATH] INIT(DUMPFILE);
  196. + #else
  197. + DECL    char            path_dumpfile[_MAX_PATH] INIT(_PATH_DUMPFILE);
  198. + #endif
  199. + DECL    char            *dumpfile INIT(path_dumpfile);
  200. + #else
  201. + 
  202. + #ifdef DUMPFILE
  203.   DECL    char            *dumpfile INIT(DUMPFILE);
  204.   #else
  205.   DECL    char            *dumpfile INIT(_PATH_DUMPFILE);
  206. + #endif
  207. + 
  208.   #endif
  209.   
  210.           /* root hash table */
  211. diff -r -w -c 494p1/named/named-xfer.c os2-494p1/named/named-xfer.c
  212. *** 494p1/named/named-xfer.c    Mon Aug 05 01:31:31 1996
  213. --- os2-494p1/named/named-xfer.c    Tue Sep 03 22:01:56 1996
  214. ***************
  215. *** 113,119 ****
  216. --- 113,123 ----
  217.   
  218.   static  struct zoneinfo zone;           /* zone information */
  219.   
  220. + #ifdef __EMX__
  221. + static  char            ddtfilename[_MAX_PATH] = _PATH_TMPXFER,
  222. + #else
  223.   static  char            ddtfilename[] = _PATH_TMPXFER,
  224. + #endif
  225.                           *ddtfile = ddtfilename,
  226.                           *tmpname,
  227.                           *domain;                /* domain being xfered */
  228. ***************
  229. *** 276,281 ****
  230. --- 280,286 ----
  231.                                  tmpname);
  232.                   exit(XFER_FAIL);
  233.           }
  234. + #ifndef __EMX__
  235.   #if HAVE_FCHMOD
  236.           if (fchmod(dbfd, 0644) == -1)
  237.   #else
  238. ***************
  239. *** 288,293 ****
  240. --- 293,299 ----
  241.                                  tmpname);
  242.                   exit(XFER_FAIL);
  243.           }
  244. + #endif
  245.           if ((dbfp = fdopen(dbfd, "r+")) == NULL) {
  246.                   perror(tmpname);
  247.                   if (!quiet)
  248. ***************
  249. *** 296,306 ****
  250. --- 302,322 ----
  251.           }
  252.   #ifdef DEBUG
  253.           if (debug) {
  254. + #ifdef __EMX__
  255. +                 /* for OS/2 we check the TMP environment-variable first */
  256. +                 char *cp;
  257. + 
  258. +                 if (((cp = getenv("TMP")) != NULL) || ((cp = getenv("TEMP")) != NULL)) {
  259. +                   strcpy(ddtfilename, cp);
  260. +                   strcat(ddtfilename, _PATH_TMPXFERF);
  261. +                 }
  262. + #endif
  263.                   /* ddtfile is now something like "/usr/tmp/xfer.ddt.XXXXXX" */
  264.                   if ((ddtd = mkstemp(ddtfile)) == -1) {
  265.                           perror(ddtfile);
  266.                           debug = 0;
  267.                   }
  268. + #ifndef __EMX__
  269.   #if HAVE_FCHMOD
  270.                   else if (fchmod(ddtd, 0644) == -1)
  271.   #else
  272. ***************
  273. *** 309,315 ****
  274.           {
  275.               perror(ddtfile);
  276.               debug = 0;
  277. !         } else if ((ddt = fdopen(ddtd, "w")) == NULL) {
  278.               perror(ddtfile);
  279.               debug = 0;
  280.           } else {
  281. --- 325,333 ----
  282.                   {
  283.                           perror(ddtfile);
  284.                           debug = 0;
  285. !                 }
  286. ! #endif
  287. !                 else if ((ddt = fdopen(ddtd, "w")) == NULL) {
  288.                           perror(ddtfile);
  289.                           debug = 0;
  290.                   } else {
  291. ***************
  292. *** 412,418 ****
  293. --- 430,440 ----
  294.           switch (result) {
  295.   
  296.           case XFER_SUCCESS:                      /* ok exit */
  297. + #ifdef __EMX__
  298. +                 if (rename_unixstyle(tmpname, dbfile) == -1) {
  299. + #else
  300.                   if (rename(tmpname, dbfile) == -1) {
  301. + #endif
  302.                           perror("rename");
  303.                           if (!quiet)
  304.                               syslog(LOG_ERR, "rename %s to %s: %m",
  305. diff -r -w -c 494p1/named/ns_glob.h os2-494p1/named/ns_glob.h
  306. *** 494p1/named/ns_glob.h    Mon May 20 08:10:02 1996
  307. --- os2-494p1/named/ns_glob.h    Tue Sep 03 23:27:00 1996
  308. ***************
  309. *** 190,197 ****
  310. --- 190,252 ----
  311.           /* next query to retry */
  312.   DECL    struct qinfo            *retryqp        INIT(NULL);
  313.   
  314. + #ifdef __EMX__
  315. + /* initialization of some files differs due to the possibility of environment
  316. +  * variable overrides; these get fixed in ns_main.c somewhere in main() */
  317. + 
  318.           /* default boot file */
  319.   #ifdef BOOTFILE
  320. + DECL    char                    path_boot[_MAX_PATH]       INIT(BOOTFILE);
  321. + #else
  322. + DECL    char                    path_boot[_MAX_PATH]       INIT(_PATH_BOOT);
  323. + #endif
  324. + DECL    char                    *bootfile                  INIT(path_boot);
  325. + 
  326. +         /* default debug output file */
  327. + #ifdef DEBUGFILE
  328. + DECL    char                    path_debug[_MAX_PATH]      INIT(DEBUGFILE);
  329. + #else
  330. + DECL    char                    path_debug[_MAX_PATH]      INIT(_PATH_DEBUG);
  331. + #endif
  332. + DECL    char                    *debugfile                 INIT(path_debug);
  333. + 
  334. + #ifdef WANT_PIDFILE
  335. +         /* file to store current named PID */
  336. + #ifdef PIDFILE
  337. + DECL    char                    path_pidfile[_MAX_PATH]    INIT(PIDFILE);
  338. + #else
  339. + DECL    char                    path_pidfile[_MAX_PATH]    INIT(_PATH_PIDFILE);
  340. + #endif
  341. + DECL    char                    *PidFile                   INIT(path_pidfile);
  342. + #endif /* WANT_PIDFILE */
  343. + 
  344. + #ifdef STATSFILE
  345. + DECL    char                    path_stats[_MAX_PATH]      INIT(STATSFILE);
  346. + #else
  347. + DECL    char                    path_stats[_MAX_PATH]      INIT(_PATH_STATS);
  348. + #endif
  349. + DECL    char                    *statsfile                 INIT(path_stats);
  350. + 
  351. + #ifdef TMPDIR
  352. + DECL    char                    path_tempdir[_MAX_PATH]    INIT(TMPDIR);
  353. + #else
  354. + DECL    char                    path_tempdir[_MAX_PATH]    INIT(_PATH_TMPDIR);
  355. + #endif
  356. + DECL    char                    *path_tmpdir               INIT(path_tempdir);
  357. + 
  358. + #ifdef PATH_XFER
  359. + DECL    char                    path_named_xfer[_MAX_PATH] INIT(PATH_XFER);
  360. + #else
  361. + DECL    char                    path_named_xfer[_MAX_PATH] INIT(_PATH_XFER);
  362. + #endif
  363. + DECL    char                    *path_xfer                 INIT(path_named_xfer);
  364. + 
  365. + DECL    char                    path_xferddt[_MAX_PATH]    INIT(_PATH_XFERDDT);
  366. + DECL    char                    path_xfertrace[_MAX_PATH]  INIT(_PATH_XFERTRACE);
  367. + 
  368. + #else
  369. +         /* default boot file */
  370. + #ifdef BOOTFILE
  371.   DECL    char                    *bootfile       INIT(BOOTFILE);
  372.   #else
  373.   DECL    char                    *bootfile       INIT(_PATH_BOOT);
  374. ***************
  375. *** 213,218 ****
  376. --- 268,281 ----
  377.   #endif
  378.   #endif /*WANT_PIDFILE*/
  379.   
  380. + #ifdef STATSFILE
  381. + DECL    const char              *statsfile      INIT(STATSFILE);
  382. + #else
  383. + DECL    const char              *statsfile      INIT(_PATH_STATS);
  384. + #endif
  385. + 
  386. + #endif
  387. + 
  388.           /* zone information */
  389.   DECL    struct zoneinfo         *zones          INIT(NULL);
  390.   
  391. ***************
  392. *** 245,256 ****
  393.   #ifdef SLAVE_FORWARD
  394.       /* retry time when a slave */
  395.   DECL    int            slave_retry    INIT(4);
  396. - #endif
  397. - 
  398. - #ifdef STATSFILE
  399. - DECL    const char        *statsfile    INIT(STATSFILE);
  400. - #else
  401. - DECL    const char        *statsfile    INIT(_PATH_STATS);
  402.   #endif
  403.   
  404.   DECL    const char        sendtoStr[]    INIT("sendto");
  405. --- 308,313 ----
  406. diff -r -w -c 494p1/named/ns_init.c os2-494p1/named/ns_init.c
  407. *** 494p1/named/ns_init.c    Mon Aug 05 01:31:32 1996
  408. --- os2-494p1/named/ns_init.c    Tue Sep 03 21:48:56 1996
  409. ***************
  410. *** 267,273 ****
  411. --- 267,277 ----
  412.                   }
  413.                   if (strcasecmp(buf, "directory") == 0) {
  414.                           (void) getword(buf, sizeof(buf), fp, 0);
  415. + #ifdef __EMX__
  416. +                         if (_chdir2(buf) < 0) {
  417. + #else
  418.                           if (chdir(buf) < 0) {
  419. + #endif
  420.                                   syslog(LOG_CRIT, "directory %s: %m\n",
  421.                                           buf);
  422.                                   exit(1);
  423. ***************
  424. *** 588,595 ****
  425. --- 592,604 ----
  426.                                    * We will always transfer this zone again
  427.                                    * after a reload.
  428.                                    */
  429. + #ifdef __EMX__
  430. +                                  sprintf(buf, "%s/NsTmp%ld.%d", path_tmpdir,
  431. +                                         (long)getpid(), tmpnum++);
  432. + #else
  433.                                    sprintf(buf, "%s/NsTmp%ld.%d", _PATH_TMPDIR,
  434.                                           (long)getpid(), tmpnum++);
  435. + #endif
  436.                                   source = savestr(buf);
  437.                                   zp->z_flags |= Z_TMP_FILE;
  438.                           } else
  439. diff -r -w -c 494p1/named/ns_main.c os2-494p1/named/ns_main.c
  440. *** 494p1/named/ns_main.c    Mon Aug 05 01:31:32 1996
  441. --- os2-494p1/named/ns_main.c    Tue Sep 03 23:37:40 1996
  442. ***************
  443. *** 197,202 ****
  444. --- 197,236 ----
  445.           u_char ip_opts[50];             /* arbitrary size */
  446.   #endif
  447.   
  448. + #ifdef __EMX__
  449. +         char *cp;
  450. +         if ((cp = getenv("ETC")) != NULL) {
  451. +           /* ETC points to the OS/2 version of the /etc directory */
  452. +           strcpy(bootfile, cp);
  453. +           strcat(bootfile, _PATH_BOOTF);
  454. +           strcpy(PidFile, cp);
  455. +           strcat(PidFile, _PATH_PIDFILEF);
  456. +         }
  457. + 
  458. +         if (((cp = getenv("TMP")) != NULL) || ((cp = getenv("TEMP")) != NULL)) {
  459. +           /* TMP or TEMP points to the OS/2 temporaries directory */
  460. +           strcpy(debugfile, cp);
  461. +           strcat(debugfile, _PATH_DEBUGF);
  462. +           strcpy(statsfile, cp);
  463. +           strcat(statsfile, _PATH_STATSF);
  464. +           strcpy(path_xfertrace, cp);
  465. +           strcat(path_xfertrace, _PATH_XFERTRACEF);
  466. +           strcpy(path_xferddt, cp);
  467. +           strcat(path_xferddt, _PATH_XFERDDTF);
  468. +           strcpy(path_tmpdir, cp);
  469. +         }
  470. + 
  471. +         if ((cp = getenv("NAMED_XFER")) != NULL) {
  472. +           /* NAMED_XFER points to the named-xfer program */
  473. +           strcpy(path_xfer, cp);
  474. +         }
  475. + 
  476. +         if ((cp = getenv("NAMED_BOOT")) != NULL) {
  477. +           /* NAMED_BOOT points to the named.boot file */
  478. +           strcpy(bootfile, cp);
  479. +         }
  480. + #endif
  481. + 
  482.           local_ns_port = ns_port = htons(NAMESERVER_PORT);
  483.   
  484.           /* BSD has a better random number generator but it's not clear
  485. ***************
  486. *** 507,512 ****
  487. --- 541,547 ----
  488.   #if defined(SYSV) || defined(hpux)
  489.                   setpgrp();
  490.   #else
  491. + #ifndef __EMX__
  492.                   {
  493.                           struct itimerval ival;
  494.   
  495. ***************
  496. *** 531,536 ****
  497. --- 566,572 ----
  498.                                   (void) my_close(n);
  499.                           }
  500.                   }
  501. + #endif
  502.   #endif /* SYSV */
  503.   #endif /* HAVE_DAEMON */
  504.           }
  505. diff -r -w -c 494p1/named/ns_maint.c os2-494p1/named/ns_maint.c
  506. *** 494p1/named/ns_maint.c    Mon Aug 05 01:31:32 1996
  507. --- os2-494p1/named/ns_maint.c    Tue Sep 03 21:54:20 1996
  508. ***************
  509. *** 414,421 ****
  510.   #endif
  511.   
  512.       dprintf(1, (ddt, "startxfer() %s\n", zp->z_origin));
  513. ! 
  514.       argv[argc++] = _PATH_XFER;
  515.       argv[argc++] = "-z";
  516.       argv[argc++] = zp->z_origin;
  517.       argv[argc++] = "-f";
  518. --- 414,424 ----
  519.   #endif
  520.   
  521.           dprintf(1, (ddt, "startxfer() %s\n", zp->z_origin));
  522. ! #ifdef __EMX__
  523. !         argv[argc++] = path_xfer;
  524. ! #else
  525.           argv[argc++] = _PATH_XFER;
  526. + #endif
  527.           argv[argc++] = "-z";
  528.           argv[argc++] = zp->z_origin;
  529.           argv[argc++] = "-f";
  530. ***************
  531. *** 443,452 ****
  532. --- 446,463 ----
  533.                   sprintf(debug_str, "%d", debug);
  534.                   argv[argc++] = debug_str;
  535.                   argv[argc++] = "-l";
  536. + #ifdef __EMX__
  537. +                 argv[argc++] = path_xferddt;
  538. + #else
  539.                   argv[argc++] = _PATH_XFERDDT;
  540. + #endif
  541.                   if (debug > 5) {
  542.                           argv[argc++] = "-t";
  543. + #ifdef __EMX__
  544. +                         argv[argc++] = path_xfertrace;
  545. + #else
  546.                           argv[argc++] = _PATH_XFERTRACE;
  547. + #endif
  548.                   }
  549.           }
  550.   #endif
  551. ***************
  552. *** 503,510 ****
  553. --- 514,526 ----
  554.   
  555.           if (pid == 0) {
  556.                   /* Child. */
  557. + #ifdef __EMX__
  558. +                 execv(path_xfer, argv);
  559. +                 syslog(LOG_ERR, "can't exec %s: %m", path_xfer);
  560. + #else
  561.                   execv(_PATH_XFER, argv);
  562.                   syslog(LOG_ERR, "can't exec %s: %m", _PATH_XFER);
  563. + #endif
  564.                   _exit(XFER_FAIL);       /* Avoid duplicate buffer flushes. */
  565.           }
  566.           /* Parent. */
  567. diff -r -w -c 494p1/named/ns_req.c os2-494p1/named/ns_req.c
  568. *** 494p1/named/ns_req.c    Mon Aug 05 01:31:33 1996
  569. --- os2-494p1/named/ns_req.c    Tue Sep 03 23:41:44 1996
  570. ***************
  571. *** 2034,2041 ****
  572. --- 2034,2043 ----
  573.           static const int sndbuf = XFER_BUFSIZE * 2;
  574.   #endif
  575.   #ifdef SO_LINGER
  576. + #ifndef __EMX__
  577.           static const struct linger ll = { 1, 120 };
  578.   #endif
  579. + #endif
  580.   
  581.           dprintf(5, (ddt, "startxfr()\n"));
  582.   
  583. ***************
  584. *** 2136,2141 ****
  585. --- 2138,2144 ----
  586.           fwritemsg(rfp, soa, soalen);
  587.           (void) fflush(rfp);
  588.   #ifdef SO_LINGER
  589. + #ifndef __EMX__
  590.           /* kernels that map pages for IO end up failing if the pipe is full
  591.            * at exit and we take away the final buffer.  this is really a kernel
  592.            * bug but it's harmless on systems that are not broken, so...
  593. ***************
  594. *** 2143,2148 ****
  595. --- 2146,2152 ----
  596.           setsockopt(qsp->s_rfd, SOL_SOCKET, SO_LINGER,
  597.                      (char *)&ll, sizeof ll);
  598.           close(qsp->s_rfd);
  599. + #endif
  600.   #endif
  601.           _exit(0);
  602.           /* NOTREACHED */
  603. diff -r -w -c 494p1/named/pathnames.h os2-494p1/named/pathnames.h
  604. *** 494p1/named/pathnames.h    Wed Dec 14 22:24:22 1994
  605. --- os2-494p1/named/pathnames.h    Thu Aug 08 12:51:50 1996
  606. ***************
  607. *** 62,67 ****
  608. --- 62,92 ----
  609.   # define _PATH_XFER_PREDEFINED  /* probably from Makefile */
  610.   #endif
  611.   
  612. + #ifdef __EMX__
  613. + #define _PATH_BOOT      "/tcpip/etc/namedb/named.boot"
  614. + #define _PATH_BOOTF     "/namedb/named.boot"
  615. + #define _PATH_DEVNULL   "nul"
  616. + #define _PATH_TTY       "con"
  617. + #ifndef _PATH_XFER
  618. + # define _PATH_XFER     "/tcpip/bin/named-xfer"
  619. + #endif
  620. + #define _PATH_DEBUG     "/tmp/named.run"
  621. + #define _PATH_DEBUGF    "/named.run"
  622. + #define _PATH_DUMPFILE  "/tmp/named_dump.db"
  623. + #define _PATH_DUMPFILEF  "/named_dump.db"
  624. + #define _PATH_PIDFILE  "/tcpip/etc/named.pid"
  625. + #define _PATH_PIDFILEF "/named.pid"
  626. + #define _PATH_STATS     "/tmp/named.stats"
  627. + #define _PATH_STATSF    "/named.stats"
  628. + #define _PATH_XFERTRACE "/tmp/xfer.trace"
  629. + #define _PATH_XFERTRACEF "/xfer.trace"
  630. + #define _PATH_XFERDDT   "/tmp/xfer.ddt"
  631. + #define _PATH_XFERDDTF  "/xfer.ddt"
  632. + #define _PATH_TMPXFER   "/tmp/xfer.ddt.XXXXXX"
  633. + #define _PATH_TMPXFERF  "/xfer.ddt.XXXXXX"
  634. + #define _PATH_TMPDIR    "/tmp"
  635. + 
  636. + #else
  637.   #if defined (__sgi) && !defined(_SYSTYPE_SVR4) && !defined(__SYSTYPE_SVR4)
  638.   #define _PATH_BOOT      "/usr/etc/named.d/named.boot"
  639.   #else
  640. ***************
  641. *** 120,122 ****
  642. --- 145,149 ----
  643.   #else
  644.   # undef _PATH_XFER_PREDEFINED
  645.   #endif /*_PATH_XFER_PREDEFINED*/
  646. + 
  647. + #endif /* __EMX__ */
  648. diff -r -w -c 494p1/res/getnetent.c os2-494p1/res/getnetent.c
  649. *** 494p1/res/getnetent.c    Mon Aug 05 01:31:35 1996
  650. --- os2-494p1/res/getnetent.c    Tue Sep 03 22:06:38 1996
  651. ***************
  652. *** 59,65 ****
  653. --- 59,69 ----
  654.   #include <string.h>
  655.   
  656.   #ifndef _PATH_NETWORKS
  657. + #ifdef __EMX__
  658. + #define _PATH_NETWORKS  "/tcpip/etc/networks"
  659. + #else
  660.   #define _PATH_NETWORKS  "/etc/networks"
  661. + #endif
  662.   #endif
  663.   
  664.   #define MAXALIASES      35
  665. diff -r -w -c 494p1/res/res_init.c os2-494p1/res/res_init.c
  666. *** 494p1/res/res_init.c    Mon Aug 05 01:31:37 1996
  667. --- os2-494p1/res/res_init.c    Tue Sep 03 22:08:38 1996
  668. ***************
  669. *** 156,161 ****
  670. --- 156,164 ----
  671.           register char *cp, **pp;
  672.           register int n;
  673.           char buf[BUFSIZ];
  674. + #ifdef __EMX__
  675. +         char path_resconf[_MAX_PATH];
  676. + #endif
  677.           int nserv = 0;    /* number of nameserver records read from file */
  678.           int haveenv = 0;
  679.           int havesearch = 0;
  680. ***************
  681. *** 253,259 ****
  682. --- 256,273 ----
  683.   #ifdef  NeXT
  684.           if (netinfo_res_init(&haveenv, &havesearch) == 0)
  685.   #endif
  686. + #ifdef __EMX__
  687. +         if ((cp = getenv("ETC")) != NULL) {
  688. +             /* ETC points to the OS/2 version of the /etc directory */
  689. +             strcpy(path_resconf, cp);
  690. +             strcat(path_resconf, "\\resolv");
  691. +         }
  692. +         else
  693. +             strcpy(path_resconf, _PATH_RESCONF);
  694. +         if ((fp = fopen(path_resconf, "r")) != NULL) {
  695. + #else
  696.           if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
  697. + #endif
  698.               /* read the config file */
  699.               while (fgets(buf, sizeof(buf), fp) != NULL) {
  700.                   /* skip comments */
  701. diff -r -w -c 494p1/tools/nslookup/main.c os2-494p1/tools/nslookup/main.c
  702. *** 494p1/tools/nslookup/main.c    Sun Jun 02 01:20:41 1996
  703. --- os2-494p1/tools/nslookup/main.c    Wed Sep 04 00:47:16 1996
  704. ***************
  705. *** 153,158 ****
  706. --- 153,163 ----
  707.    */
  708.   char            *pager;
  709.   
  710. + #ifdef __EMX__
  711. +     char        *helpfile;
  712. +     char        helpfilepath[_MAX_PATH];
  713. + #endif
  714. + 
  715.   static void CvtAddrToPtr();
  716.   static void ReadRC();
  717.   
  718. ***************
  719. *** 323,328 ****
  720. --- 328,344 ----
  721.               pager = _PATH_PAGERCMD;
  722.           }
  723.   
  724. + #ifdef __EMX__
  725. +         helpfile = getenv("NSLOOKUP_HELP");
  726. +         if (helpfile == NULL) {
  727. +             _searchenv(_PATH_HELPFILEF, "HELP", helpfilepath);
  728. +             if (helpfilepath == "") {
  729. +               helpfile = helpfilepath;
  730. +             } else
  731. +               helpfile = _PATH_HELPFILE;
  732. +         }
  733. + #endif
  734. + 
  735.           /*
  736.            * Setup the environment to allow the interrupt handler to return here.
  737.            */
  738. ***************
  739. *** 1051,1057 ****
  740. --- 1067,1077 ----
  741.   {
  742.           char cmd[PATH_MAX];
  743.   
  744. + #ifdef __EMX__
  745. +         sprintf(cmd, "%s %s", pager, helpfile);
  746. + #else
  747.           sprintf(cmd, "%s %s", pager, _PATH_HELPFILE);
  748. + #endif
  749.           system(cmd);
  750.   }
  751.   
  752. diff -r -w -c 494p1/tools/nslookup/pathnames.h os2-494p1/tools/nslookup/pathnames.h
  753. *** 494p1/tools/nslookup/pathnames.h    Wed Dec 14 22:24:32 1994
  754. --- os2-494p1/tools/nslookup/pathnames.h    Tue Sep 03 23:41:48 1996
  755. ***************
  756. *** 62,71 ****
  757. --- 62,81 ----
  758.   #define _PATH_PAGERCMD          "more"
  759.   
  760.   #ifndef _PATH_HELPFILE
  761. + #ifdef __EMX__
  762. + #define _PATH_HELPFILE          "/tcpip/help/nslookup.help"
  763. + #else
  764.   #if defined(BSD) && BSD >= 198810
  765.   #define _PATH_HELPFILE          "/usr/share/misc/nslookup.help"
  766.   #else
  767.   #define _PATH_HELPFILE          "/usr/lib/nslookup.help"
  768. + #endif
  769. + #endif
  770. + #endif
  771. + 
  772. + #ifndef _PATH_HELPFILEF
  773. + #ifdef __EMX__
  774. + #define _PATH_HELPFILEF         "nslookup.help"
  775.   #endif
  776.   #endif
  777.   
  778.